From cdc2f07a1efa7a23878bf5cf6d8dca4170ffc561 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Tue, 5 Nov 2013 15:29:54 -0500 Subject: [PATCH] demo: use the installed named icon --- demos/gtk-demo/Makefile.am | 3 --- demos/gtk-demo/application.c | 6 +----- demos/gtk-demo/demo.gresource.xml | 5 ----- demos/gtk-demo/gtk-logo-24.png | Bin 674 -> 0 bytes demos/gtk-demo/gtk-logo-48.png | Bin 2405 -> 0 bytes demos/gtk-demo/gtk-logo-old.png | Bin 5895 -> 0 bytes demos/gtk-demo/images.c | 7 +------ demos/gtk-demo/listbox.c | 4 +--- demos/gtk-demo/main.c | 16 +--------------- demos/gtk-demo/stack.ui | 2 +- demos/gtk-demo/textview.c | 15 ++++++++------- 11 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 demos/gtk-demo/gtk-logo-24.png delete mode 100644 demos/gtk-demo/gtk-logo-48.png delete mode 100644 demos/gtk-demo/gtk-logo-old.png diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am index 3cc92d672a..cbfabeb4c1 100644 --- a/demos/gtk-demo/Makefile.am +++ b/demos/gtk-demo/Makefile.am @@ -134,9 +134,6 @@ RESOURCES= $(demos) \ gnome-gmush.png \ gnome-gsame.png \ gnu-keys.png \ - gtk-logo-24.png \ - gtk-logo-48.png \ - gtk-logo-old.png \ messages.txt \ css_accordion.css \ css_basics.css \ diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c index 048535aaa5..d250586286 100644 --- a/demos/gtk-demo/application.c +++ b/demos/gtk-demo/application.c @@ -95,7 +95,6 @@ activate_about (GSimpleAction *action, gpointer user_data) { GtkWidget *window = user_data; - GdkPixbuf *pixbuf; const gchar *authors[] = { "Peter Mattis", @@ -113,8 +112,6 @@ activate_about (GSimpleAction *action, NULL }; - pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-48.png", NULL); - gtk_show_about_dialog (GTK_WINDOW (window), "program-name", "GTK+ Code Demos", "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d", @@ -128,10 +125,9 @@ activate_about (GSimpleAction *action, "comments", "Program to demonstrate GTK+ functions.", "authors", authors, "documenters", documentors, - "logo", pixbuf, + "logo-icon-name", "gtk3-demo", "title", "About GTK+ Code Demos", NULL); - g_object_unref (pixbuf); } static void diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml index 66a65c4dd1..f856681eed 100644 --- a/demos/gtk-demo/demo.gresource.xml +++ b/demos/gtk-demo/demo.gresource.xml @@ -1,8 +1,6 @@ - gtk-logo-24.png - gtk-logo-48.png application.ui menus.ui @@ -59,7 +57,6 @@ alphatest.png floppybuddy.gif - gtk-logo-old.png apple-red.png @@ -125,12 +122,10 @@ floppybuddy.gif - gtk-logo-old.png listbox.ui messages.txt - gtk-logo-48.png apple-red.png diff --git a/demos/gtk-demo/gtk-logo-24.png b/demos/gtk-demo/gtk-logo-24.png deleted file mode 100644 index 54e3ba0d64082af59e871fd99dce6c187c3d4e4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 674 zcmV;T0$u%yP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L00vk900vkAABO_!00007bV*G`2iO7< z4J|OdLIH*V00JUOL_t(Y$Gw%mZxV4B#y{`LfsiQOBqgXJ4tA)~-No6Z2{95A)6QKP zjEMtF6CD_BSBQyehmQIebaD|j>0+e*fU^!Hg($5QcpVCtJMNAHqQ298@9uq{@B2LO z5BSF>vpT4%0rUYxB-G!SBB0BFexY3D&BrE=cYzl13+Ox-%GE&U(Kl7qUSBVp5#w7R zfU151vXcS^*`pWldG_$eS3k;~6lH(y>`+>}IWs`7KcG;q`cmf7;3%J`Au<=pIAwtv z09aS9Qu^{aR0F_snd0Fh#gyeOQ&rW5qv|A)Ksz1M!^@0-`~r?!F=g2$?9RY2U@$lX z>~sKVh_JA|O=<1ED_}0U$!=?%nfgFX)Ay&Nd>(+OKdw)$N3(Yz-bRZ?Cpw*Iduo7- zM#}I|B&LamIA)`_xfOp93J{U=QQ+9Efe%HJNRZsxvUvx1)qYHm6Z;&XMbA@3hnWoh zdYy$z#jU~WDrr^UiWz0(1R0j8AtLI^;KIhn*+VR53may&?jDWPcjS_ryghzNt-Hr? z(&~5yQQ)_gOrmYCm_ZphCx0&a9DwEciroix6^Td}Fc(`bB1=ni3<_npwa#*U1)%2N z2O>SdxU|2IkxtJPzL>HorYydnez*f%3!Ftm?qqy)_%D+fPf`Z}wEFeC3z5w0(1qgw znh4?;XlW6#=3d&Wsy{0gRaLDt?>V>Uxxcpbo%4N~MgL#z51R=B#N%x%ssI2007*qo IM6N<$f-D{_P*M3&LRs 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 X#W|87P<$*^00000NkvXXu0mjf3D{Gs diff --git a/demos/gtk-demo/gtk-logo-old.png b/demos/gtk-demo/gtk-logo-old.png deleted file mode 100644 index e6037ae8b8109d12dceeeb3909a9b9c70ab82df2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5895 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 #include -static GdkPixbuf *avatar_pixbuf_gtk; static GdkPixbuf *avatar_pixbuf_other; static GtkWidget *window = NULL; @@ -183,7 +182,7 @@ gtk_message_row_update (GtkMessageRow *row) gtk_button_set_label (GTK_BUTTON (priv->resent_by_button), priv->message->resent_by); if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0) - gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_gtk); + gtk_image_set_from_icon_name (priv->avatar_image, "gtk3-demo", GTK_ICON_SIZE_DND); else gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_other); @@ -317,7 +316,6 @@ do_listbox (GtkWidget *do_widget) if (!window) { - avatar_pixbuf_gtk = gdk_pixbuf_new_from_resource_at_scale ("/listbox/gtk-logo-48.png", 32, 32, FALSE, NULL); avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index cb9a1a6b92..19b2dd7141 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -882,20 +882,6 @@ create_tree (void) return box; } -static void -setup_default_icon (void) -{ - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-48.png", NULL); - /* We load a resource, so we can guarantee that loading it is successful */ - g_assert (pixbuf); - - gtk_window_set_default_icon (pixbuf); - - g_object_unref (pixbuf); -} - int main (int argc, char **argv) { @@ -915,7 +901,7 @@ main (int argc, char **argv) gtk_init (&argc, &argv); - setup_default_icon (); + gtk_window_set_default_icon_name ("gtk3-demo"); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "GTK+ Code Demos"); diff --git a/demos/gtk-demo/stack.ui b/demos/gtk-demo/stack.ui index d400dc1337..334c145b22 100644 --- a/demos/gtk-demo/stack.ui +++ b/demos/gtk-demo/stack.ui @@ -32,7 +32,7 @@ False 20 20 - /application/gtk-logo-48.png + gtk3-demo page1 diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c index 2bb6e2866d..775ede6864 100644 --- a/demos/gtk-demo/textview.c +++ b/demos/gtk-demo/textview.c @@ -129,15 +129,16 @@ insert_text (GtkTextBuffer *buffer) GtkTextIter iter; GtkTextIter start, end; GdkPixbuf *pixbuf; - GdkPixbuf *scaled; - - pixbuf = gdk_pixbuf_new_from_resource ("/textview/gtk-logo-old.png", NULL); + GtkIconTheme *icon_theme; + + icon_theme = gtk_icon_theme_get_default (); + pixbuf = gtk_icon_theme_load_icon (icon_theme, + "gtk3-demo", + 32, + GTK_ICON_LOOKUP_GENERIC_FALLBACK, + NULL); g_assert (pixbuf); - scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR); - g_object_unref (pixbuf); - pixbuf = scaled; - /* get start of buffer; each insertion will revalidate the * iterator to point to just after the inserted text. */ -- 2.30.2